Remove GtkFileSystemError, use GtkFileChooserError instead. (#538378,

2008-06-18  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkfilesystem.[ch]: Remove GtkFileSystemError, use
        GtkFileChooserError instead. (#538378, patch by Matthias Clasen)

svn path=/trunk/; revision=20440

diff --git a/ChangeLog b/ChangeLog
index 9302a4171f0d0259be6584d197cb796ab25955d2..6dccaf568a19261879d0dec1e0d9f17e6806151a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18  Carlos Garnacho  <carlos@imendio.com>
+
+       * gtk/gtkfilesystem.[ch]: Remove GtkFileSystemError, use
+       GtkFileChooserError instead. (#538378, patch by Matthias Clasen)
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
        * examples/gtkdial/gtkdial.[ch]: undeprecate.

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8112ffb93fe6c7743343c415bdeafabc37a1fb2c..8ba538e8d9178844d6685f951660c367e8fa1598 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -134,12 +134,6 @@ static void gtk_folder_add_file             (GtkFolder *folder,
                                             GFileInfo *info);
 
 
-GQuark
-_gtk_file_system_error_quark (void)
-{
-  return g_quark_from_static_string ("gtk-file-system-error-quark");
-}
-
 /* GtkFileSystemBookmark methods */
 void
 _gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark)
@@ -641,8 +635,8 @@ _gtk_file_system_parse (GtkFileSystem     *file_system,
       if (!parent_file)
        {
          g_set_error (error,
-                      GTK_FILE_SYSTEM_ERROR,
-                      GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
+                      GTK_FILE_CHOOSER_ERROR,
+                      GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
                       "Could not get parent file");
          *folder = NULL;
          *file_part = NULL;
@@ -989,8 +983,8 @@ _gtk_file_system_insert_bookmark (GtkFileSystem  *file_system,
       gchar *uri = g_file_get_uri (file);
 
       g_set_error (error,
-                  GTK_FILE_SYSTEM_ERROR,
-                  GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS,
+                  GTK_FILE_CHOOSER_ERROR,
+                  GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS,
                   "%s already exists in the bookmarks list",
                   uri);
 
@@ -1052,8 +1046,8 @@ _gtk_file_system_remove_bookmark (GtkFileSystem  *file_system,
       gchar *uri = g_file_get_uri (file);
 
       g_set_error (error,
-                  GTK_FILE_SYSTEM_ERROR,
-                  GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
+                  GTK_FILE_CHOOSER_ERROR,
+                  GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
                   "%s does not exist in the bookmarks list",
                   uri);
 

diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index b8ee00d25265af71f9b62b88691b3e46e29e2df2..fa708fe570f680d45653e9e6f4ddad514572b703 100644 (file)
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -41,23 +41,6 @@ G_BEGIN_DECLS
 #define GTK_IS_FOLDER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_FOLDER))
 #define GTK_FOLDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_FOLDER, GtkFolderClass))
 
-/* GError enumeration for GtkFileSystem
- */
-
-#define GTK_FILE_SYSTEM_ERROR (_gtk_file_system_error_quark ())
-
-typedef enum
-{
-  GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-  GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
-  GTK_FILE_SYSTEM_ERROR_INVALID_URI,
-  GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
-  GTK_FILE_SYSTEM_ERROR_FAILED,
-  GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS
-} GtkFileSystemError;
-
-GQuark     _gtk_file_system_error_quark      (void);
-
 typedef struct GtkFileSystemClass GtkFileSystemClass;
 typedef struct GtkFileSystem GtkFileSystem;
 typedef struct GtkFolderClass GtkFolderClass;